Cleanup unused code and constructors.