attempt at removing commented out sections