remove comment
remove unused imports, add serializable to context service
Merge pull request #8 from pkoperek/MVP_9

Mvp 9 - cleanups