remove unused variables
fix docblocks