Removing all old code in prep for new implementation