Fixed redundacy removal stuff