remove Guid from constructors, remove redundant references