Cleaning up and updating Dencity and preflight