Remove extra wrapper elements