[core] cleanup