Removed more debug code so unit tests pass