cleanup copy paste stuff