Remove duplicated cruft