remove other annoying int castings