Remove crufty debug and incorrect comments. Clean up imports.