Removed unused elements