Removed warnings. Greatly simplified dependencies.