continuing to clean up sources