Drop some commented code now the functionality is implemented.