- switch to DELETE method for removal
- some code cleanups and improvements