remove unsed files, fix test and change calcs tx.