Fixes issue with type promoting
Cleans up some relicts
Fixes an issue with constant divide