remove copy/paste code