Cleaned up all non-working stuff for devel. So that no one shall be
misguided by functionalities not working.