Remove sys_* defines that are internal only and about to disappear