Merge "Clean up unused clock code" into udc-dev