Dependency cleanup

Removing dependencies on unreleased, unnecesary, not available in SCM artifacts