Functionality model cleanup