Remove if checks after new.