removed unwanted element-wrapper etc.