mass commit of old code
Cleaning up block and tank code