Remove unnecessary casts
Cleanups