Cleaning up source stuff