various clean ups