Add cleanup proc