Removing more un needed features

Removing more un needed features