Removed some Aegir specific stuff