Icon 1 cleanup