Work for - OCLM-2

Please review this and advice
Let's stay focused and write code that is absolutely needed. More code = more possible bugs and more maintenance in the future. Let's remove that.