cleanup. onload fixes