True, though the reason to remove all that functionality was to get something maintainable that could grow from there.