UC-136 code cleanup and swtiching to require call for now