chore: cleanup

closes #4287
closes #4288
2 files changed