optimized force reload

some cleaning