move cleanup method to menu