Fixed endpoint issue / Removed unused imports / Added surpress warning