Removed Unused Stuffs