#19 Deleted unused code