Housekeeping -- remove unused variables & commented code.