Clean up

Added  missing contributor block comments. Cleaned up some unnecessary
files.