MakeFile, Remove unused packages & lots of tweaks