Fixed warnings and removed TODO

*The Rect members are final, changed to new Rect instead
*Removed TODO since it is not relevant anymore