Cleanup - remove constructors that simply call their parents