cleanup remove commented code
remove yet more redundant code