Removed redundant files and fixed type