map save process refactoring done !!!
cleanup
admin updates, alert manager refactoring