Last bad commit to clean up before the final source is added