cleaned up modal