Clean up the constructors.