* code cleanup accordingto EASE changes