Remove eligibility variables and other minor fixes, fix #285