Removed Unused Stuff