Revert "Dynamic Map Creation v1.0.0.2"

This reverts commit 9c742c1574e47cec0508e6fb6c8ad67522422e61.