remove some legacy files
Clean up of old files and broken naming