clean up constructors