Get rid of the dead code
Merge branch '95x' of github.com:nddrylliog/rock into 95x