Bye-bye obsolete/broken code