rename pattern refs #14
remove unused variables refs #14