cleanup and testing cpu version