More cosmetics, removed test files, removed a few header tags