Cleaning up non working features
Merge remote-tracking branch 'origin/devel' into FTR-34-CleanUp
Cleaned up all non-working stuff for devel. So that no one shall be
misguided by functionalities not working.