Fixed buildpath and removed unused variables