cleanup here & there