Some cleanup of unused stuff