removed legacy files
merged