Removed All Unused Stuff, and Rdy to ship