remove recompilation, complete refactor to work with 0.6