Remove warnings + Remove unused method