some clearup