general cleanup, switch to Heuristica