Code clean-up (removed debug halts)