FW-131. stackdefines correction
removing timing vars added by error