De-link Maelstrom from GradFly