Removed unused wrapper elements