added clean up source