Clean up and support latest version of Prism