Removed lines previously needed for esetup.py