Removed Java6 support
Moved to parent 3