And let's get rid of all the helper files since we dont' really use those either.