better workflow, remove unused code, refactor