Hopefully removed *most* hard dependencies