delete older, commented-out code now that changes are working