Removed a System.out and some unnecessary imports