reduced imports
explicit local dependencies
remove useless dependency in .tac
issue 83