cleanup // more logging