removed unneeded elements