cleaning up some features