More fixes.
Remove erroneously-commited files.