got rid of a useless variable, got rid of testing settings