Fixed tablename removal