furthur cleanup