Clean up some lint and remove an unneeded test.