Removing unnecessary ifdef