Kotti/Kotti — pull request #350 by disko (2014-11-22 22:13:52+00:00)
Title: Feature/335 remove deprecated code

This resolves #335.

Removing lots of stuff is always scary. @dnouri: review requested.