More dependencies hacking
More DRY bin/clean.
This might suppress errors with deps.