manage commented out variables properly