Code clean-up (removal of commented chunks).