A few modifications to suit my needs, also disables delimitMate for now

Signed-off-by: Carton He <carton.he@marvell.com>