Remove system message handler and more for @kenchris comment in #65

Addressed some of @kenchris comments in #65. Many of them were addressed in #66 as well.