Remove stale, commented out code