did some cleanup of situation class