Removing more unnecessary ivars