removed redundant code that is now in method