Configs & code cleanup