TJ/EG: removed some setup things again.