removed some superfluous stuff