Fixing cleanup for index view