Prevent potential performance hits from float values being cast to/from int
Remove unused variable added in the recent overhaul...