While we're at it, let's get rid of some of the default shite