Cleaned up matt and phill merge

Cleaned up some additional lines that were added after the merge.