Removed dependency from Analgo dev-master