Remove unused and non-functional code
Do not track generated files
Merge branch 'feature/refactor' into develop