EIA Application clean up