clean up modal mostly