Port bug
Removing of unusued files