removed / commented code that was added after merge. need review and fix