Removed redundants

**Status:** Done

Any Suggestions?