cleanup and functionality work for UCP