Revert "AutoNorm and K-means"

This reverts commit 8e78c76709b20b55e63aa6e374984ba50cf2a901.
Revert "Revert "AutoNorm and K-means""

This reverts commit dee9772413469e94cb5d47198001c4f354838b68.