Removed Unused Stuff

Removed Unused Stuff