Cleanup

Add clock callback