remove large section of commented code and simplify test call