Clean up unneeded packages, move things around