Upadted to 3.7 and removed some further unused chips' modules.