Fixed: remove unused imports
Removed unneeded apichange annotations
Fixed some docblock hinting
Fixed: missing class import