removed unnecessary ifdef