cleaned up logs and warnings