Cleanup of some of the Giphy boundaries