- more source cleanup