Deprecated/remove flexible entity bundle

Remove deprecated methods and replace the code which still make reference to "flexible" concept

| Q                   | A
| ------------------- | ---
| Bug fix?            | N (remove deprecated bundle)
| New feature?        | N
| BC breaks?          | Y
| Tests pass?         | Y
| Scenarios pass?     | Y
| Checkstyle issues?  | N
| Changelog updated?  | Y
| Fixed tickets       | 
| Doc PR              |