removing comments
added message component