Start to rationalize dependencies