Removed extra trees and simplified object abstractions.