Removed redundant code (again)