Remove needless tables from this branch