Removed unneeded elements