removing commented out code, tweak copyright