Removed more deps; Added a message prefix variable