#2 Deleted unused segments of code