Remove susy and add normalize