Yes. Your room limit is based on published rooms, so a room that has been removed no longer counts toward your published room limit.
Yes. Your room limit is based on published rooms, so a room that has been removed no longer counts toward your published room limit.