feat: Cleanup