clean up Message.js