Remove overrides and use chef master