Style: uncomment still useful code