Resharp code and remove unused