revert drop statements and enable debug