got rid of superfluous stuff