Minor refactoring, updated system service

Removed unnecessary methods, temporarily mocked