cleanup
skeleton of remade thrust version