Cleaned Map

This should automerge