Removed temp hack for remote initial view