Removed some tables to simplify the code.