Code cleanup (unused/commented out) code is removed