clean up for features