Removed packages, added HOME def