removing defaults and fixing config