1308: Add
Remove unnecessary code