Code cleanup in isle 7