removed some commented out code left in by mistake