Fix all the specs, remove some unneeded dependencies

Signed-off-by: Mikael Henriksson <mikael@zoolutions.se>