[Develop] Removed unused use statements and doc block fixes.