removing some unreferenced objects
resolving conflict#