[f18-branch] Remove a couple things that aren't working