Removed clock dependencies