OSNG-91 - some refactorings due to process handling, removed unnecessary stuff