Removing erroneous code, fixes cpp native builds