deleted some unused elements