got rid of unnecessary stuff