Modularized; removed dps_clock