hopefully last part of cleanup

i promise I'll stop PR-spamming you after this one