Why keep the commented out code? It looks outdated so probably should just remove it.