Remove clone (use extend)
Remove unused code