Removed a good bit of unused code. Currently converting code to meet coding standards