Cleaned up file that was messed up from the merge