Cleanup unused variables and comments, add missing author comments