Cast removal

The unpractical casts are finally being removed..