Update usage

Also remove unneeded debug messages.