A little cleanup of the libs due to OCD