cleaning up internal Feature stuff.