Cleanup the definition of the internal interfaces in the algorithms