Changes after review

Remove bad copy/paste code.