Removed redundant code and files