Fixing build--commented out stub code