Drop old-style Element support