Further mobile and grid cleanups