Resharp code and remove unused merge to master