Refactor comented-out code