removed a lot of unused elements