[Element] Removed some functionality so we can add it during the demo.