Removing "message" type