Merge branch 'SMSC-Cleanups-and-clock-setup'