minor cleanup of an unused module and a repetitive line or 2