Clean up dirty code from adding ets gen_server