Revert "Merge branch 'AddingSaveFeaturesToTripSummaryPage'"

This reverts commit 15ecbdeb75e86c42e0eaac516c915d97039450cf, reversing
changes made to 4f162c539953d253329a9123072ddfa77f4919cf.