some PHPDoc fixes in lib

I fixed some PHPDoc and removed some unused imports also