Remove a few unused bits and bobs.