Delete & code changes