little cleanup on now redundant code