Feature/now 266

Can we remove this commented out code and all the other commented out code in these files?