removing hardcoded table name