Feature/now 337

Delete unused code.