Remove variable used by removed tests
Begin adding some structural comments