Cleaning up Chatter toolkit to work with Mono