Removed Trap redundency in parser.