Delete Cloneable
Mark TODO
Refactoring