Clean : Remove legacy files & manage getters/setters