Removed comments and unused files