Fix problem with duplications. Remove some commented code.