Remove entry/comments + parser fix