tidied up map initialization, got rid of the old remote_model