Remove StagedFile
Remove some old specs