Add columns to message/command + get rid of unused deps