more cleanup of guards