Removed useless function and file depencies.