Removed references to BaseWindow as it is not used anymore

Rel Issue: GCP-9005