MVP cleanup
MVP cleanup -- deleted or renamed files