Some code cleanup in verdantembeds