Feature Hiding

Commented out a few more features for now.