Removed more features for testing