Again, just checking this was intended... should these commented out lines just be deleted?