Remove redundant readonly class