Got rid of log statements and tests that were not correct