Comment code and cleanup.