#488 Removing print statement, updating todo