Instance remote usage refactoring

Remote property removed from model module

Change-Id: I65dbde6ca95ed22ad1deb04c2a5ec0e31a0b417f