jpakkane Removed dupe code.