Removed code in dispose