Fixed errors caused by deleted code from dropping tables