even more clean-up :|