I guess these commented out lines aren't needed anymore?