dependencies sweep, and move back to main freedom* branches