Remove Gap

Completely remove gap (or mark it deprecate) and provide guidance how to migrate to deliverable.