Remove $complete variable and conditional. Code will always be executed

(throwing an exception stops flow through code)

Change-Id: Ic16e2a827f2a470f89d29986963cc5beaf8cc457