NEXT: Remove redundant code