General code cleanup
Lockout deployment requirements