clean up synchronization around options loading