cleanup and source adds