Minor cleanup

of unused/redundant code