Removed unused files and some other updates