More cleanups, remove incomplete Challenge 3 in Java