Removed some other unnecessary elements