Cleaning up simulator

ensuring compatibility with new obs_lib