Cleaning up artifacts from merge

Cleaning up merge