Moved some of the of the checks into a TAInCBlockValidator validation class
Removed old code