Clean up some stuff, remove unused packages, etc