Cleaned up template logic
Overide delete with methods if needed