Remove curb dependency