small cleanup
removed garbage files
mergefix