Cosmetics
Cleaning up shutdown barrier