cleanuping more stuff