Remove deprecated function
Add <clock/>