Changed to 2D vector for tiles, cleaned up legacy code