Havana and  the big cleanup-everything

Default deployment works, haven't yet tested all the major combinations. Opened already as a heads-up and so that people can comment.