Small source clean up