Remove copy paste code