Cleanup and remove dev modifications
Tidy up loose ends and clarify modal info