remove obsolete, unused code & comments