removed optimization that wasn't optimizing...