Next lot of cleanup

thanks, didn't know that