small source cleanup