Removed unused elements and attributes