Modify package dependency
Remove clockwork related code
Add helper library