Remove this, looks like duplicated code