Several changes in elect.py
Remove unused stuff