Stripped out some more undesirable items