Removed things that didn't work in a test and shouldn't have been here.