Removes hardcoded cdb tables for development