Clean up code
Add support for delete expression