some cleanup; hack for cpu misplaced data