Cleanup. Reloading fix