source cleanup - making tests happy