took out last bit
took out lots of stuff