Comments and cleanup of old functions