Remove debug and other clean up.