code cleanup
handle PUs without properties