- Removed a bunch of un-needed redraws