remove useless cast
Clean up some @Version lines
Split out a bit of code for BEGIN processing test