Cleaning up some features