Configs cleanups