Add delete parameter
Remove unsued comments and debug code
Code cleanup