#1110: Removed not used cruft and upgraded atmosphere.