Not implemented scenarious removed, small refactoring conducted