Fixed average and keywords operations
Removed unused models