fix: hacks and fixes for removin lead classes