Removed duplicate deps and small config fixes