Clean up load code