uhhh, more cleanup