cleaning up tons of stuff, simplifying for new mangrove-base