Removed dupe code