Minor cleaning
Implemented delete feature