Makes sense. Let's just remove the commented out stuff then as well?