cleanup: rebase fixes

Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
cleanup: rebase clock

Signed-off-by: Robert Nelson <robertcnelson@gmail.com>