got rid of unnecessary changes