Removing reference to remote in layout