[fix] reduce function calls and clean up asap