Revert "Map load and draw"

This reverts commit 756f32dafaaa4424c01e249f06c80d9b38fcf7df.