Update PSR-2 and remove unused use