Removed redundants

**Status:** Work in Progress