Feature/3224 'remove' code for release builds