removed unneeded block