Updated to compile on latest build tools
Removed commented out code and other jibber jabber