Add some extra logging and make the rm comment silent