Cleaning up a bunch of commented blocks which are no longer used
Adding even more cleanup of material