Remove some old useless junk and development scratch comments