Fixed Normalization and data handling problems
Revert "Fixed Normalization and data handling problems"

This reverts commit 417e68fe63d5dfb9c1f1aefc134126e25b49733e.