Revert "Detailed UC4 within #58"

This reverts commit 99e990006438d42978a0c05a6c2fe8e81918341c.