Cleanup/finish converting maven recipe to use env