Had issues with only mapping in buffers
Clean up some maps