2.1 Changes

Stuff especially ugly and thus obsoleted and removed stuff from the ROCK code base: