Removed most normalizations