Rid of unnecessary ivars