Remove some old files
Fix up VersionHelper for log4j