Use java 6
Removed unhelpful constants. Now using @AutoService