removed evewho specific code