clean up lots of disabled code