removed superfluous stuff