Miscellaneous source cleanup