removed redundant code (again)