Cleaned up spare code scraps.