removed hardcoded db table prefixes