Cleanup, temporary flicker fix.