Remove duplicate invalidate() calls