Remove logging and test focusing