Finally removed everything except message field