Clean up and removed dead code in Elements.py