Clean up Functionality initialization