Fixed EOL issues and removed more junk files on cleanup