minor cleanup, debug file in one location