Fix for issue https://github.com/haches/e4mooc/issues/5
Implemented enhancement https://github.com/haches/e4mooc/issues/6

Removed some code that was commented out.