clean up the way we clean features