Stripping out code that seems to do nothing

Also removed a few final references to the 22HD.