[CREDITS] various cleanups