Remove redundacy