Cleaned up & removed dependecy (using graphs from rustc now.)