Remove debug printout and possible NPE