(m) Remove unneeded dependencies
Add names to messages