Remove unneeded dependencies, fix content source