Removed unneccessary Domain classes