Hankepage modifications and removed unneeded files