Last modifications
Remove file
Review fixes