remove unused code and keep a constant for table name separator