Deleted some superfluous blocks of commented out old code