Remove artifacts from merge
Almost have unit tests passing