Remove some old commented out code
bub: cleanups