Clean up files and comments