Cleanup

Cleanup as discussed during WP2 Telco
Cleanup
Approval of the first reference baseline