removed @author tags
Cleanup
	Pulled a bunch of code blobs into methods
	Added Suppresions for unused shim functions
	Removed debugging information