More clean ups