made the files ready for final justitia judgement, by removing dependencies on util.c