FreiDi specific code removed