Remove unused vars from modals