Remove some YAGNI