Cleaned code to remove unneeded dependencies.