removed drop statements - need to do that automatically