UF-47: Clean up