Remove dead code, test methods from prod