Removed unused elements for now