Cleaned up temp files and files in wrong locations