#20 Deleted unused code