Remove unneeded control strucutres

Formaly used to debug the primitive casting problem.