Removed unused methods and related tests, began preparation for building OFFER responses