removing unused files and fixing some indentation problems