Removed java7 specific imports that were misplaced