comment out unsed dependencies and fixed incorrect code