more clean up, eliminating handlers