Add missing conversions to fixed point.
Remove commented code.
Code cleanup.