Took out stuff relating to CHARMER_TEST, for now