Removed some unnecessary elements.