#22 Deleted unused portions of code