77 Commits (hotfix/redundant-cleanup)