feat: merge cleanup branch into master