remove unused comments
some test cleanup