Final cleanup to use gemspec for deps