cleaned out obsolute code