Cleanup unused features