remove double parsing
use new system for REST