Some cleanup of error messages and unneeded dependencies