merged and removed crap