Merge crap deleted