Remove adding index.html and code clean up