Source cleanup: Miscellaneous