removed some unneeded bits