cleaned up cal index