Partially fixed build dependencies problem + commented files removal for debugging