Revert "General fixes"

This reverts commit 26f7947e7d7016c56c902353ecf151d89a41ddc7.
Revert "Metaclub changes to arrivals"

This reverts commit f0402a2e3f69a5b5e3a711b730c4b00707e2fd40.