clean up from previous merge, more to be done for review of specs when ran