I will run the unit tests with this removed when I merge and see if it can be removed