[fix] more cleaning up