deleted some code not needed in the generic version