more reg removal :/