Cleaned out all the crap.
Fixed conflicts