master: removing custom code in favor of builtin package that exactly solvest the problem and reduces imports