Remove more splatting