more source cleanup