cleanup some boilerplate due to frozen enhancements