removed a few things that we'll tackle in the next milestone