Removed some functionality so that we can use this repo for bootcamp