+ Some more cleanup