cleanedup some leaks