Some cleanup for the frontends