DDBEASY 193 - Removed exports.
Merge branch 'DDBEASY-193' into development