Done more cleanup