Bored! Did a bit of cleanup

... sundays!