more cleaups