Clean ups in misc/