Revert "Gateway screens" saumils work to redo push properly

This reverts commit b82d1f73c0e3b6d0bba1568db9233420a2f57fdc.