Removed redundant files and cleaned some code parts.