I cleaned up some comments
I removed a few unused classes
I did some cleanup
I removed some unused methods in annotation project
Looking good