Refactor/Renaming
Remove traces