Fixed recipes
More cleaning up