Remove buggy #_'d code