Features clean up.