Osng 505

This pull request contains changes for [this bug](https://jira.osiam.org/browse/OSNG-505). An removes unused extensionblock.