implemented removeMapItem, done some refactoring