Remove System.err.println statement and other cleanups

See diff! :)