got rid of 'Demo' suffix in header comments