Feature/now 548

Delete commented out code.