Remove commented-out "not working" code