Cleaned/removed/commented old code to fix build.