More cleanup of unused things