Revert "Merge branch 'AddingSaveFeaturesToTripSummaryPage'"

This reverts commit ba37beb0af8f8499dab94e2e975af1f020e2536e, reversing
changes made to 1119ff41d0d0308188f9bdb63cc3f52ba2f4ecf9.