Remove derby-parsing from here