Removed unnecessary elements