Lint cleanup plus removal of some debug statements.