more of the same, reduction, refactoring
Remove redundant code