more code cleaning; fixed issues in destroy methods