Prevent non-app log messages to come through when running on the simulator
Remove "done" TODO's