removed crap added in by the merging bs