Forgot to remove some printf()s