Removed unneeded domain objects