Fixed a bunch of warnings
Fixed a bunch of warnings
More .idea changes
Use this() in constructor
Removed redundant annotaiton classes that are now in common