cleaned up. removed loggings