Making this branch master | I also removed some no longer needed code