Revert "Map interface working"

This reverts commit 819a3769e4357eb47c05dced7bd12b48936f4a31.