MODE-2315 Removed non Java 6 compatible idioms & imports.