removed unneeded things