cleaned up entry/index