Removed useless dependencies on some utils files.