#148 Remove some unvalidated code