Comments and removed folders stuff