* Code cleanup / unnecessary commented out sections deleted