got rid of unnecessary things