Clean up modal removal