Clean up and remove dependendencies of  inforControls