Some clean ups.