Removed some duplications