Removed dependent destroy issues