Clean up code due to auto-insert constructors