Removed table defintions. These messed up the setup routine.