Cleaned up comments and dead code

Added ability to test if we can log in Messenger, so we can keep logging in
place while still retaining the ability to run our unit tests.