some cleanup of unused things