Organize imports, comment out a few lines