UC-44 removing oversly defensive programming