Removing remote only stuff