refactored out unneeded dependencies