Removing some features that wont be needed