further implement new parsing
remove broken function references
move references to domain and app_id to config