Safeguard against removed/destroyed map
Removing some lint and fixing docs