Cleanup Features classes