Remove debugging, clean up code.