Remove unused and add post index