Trying to merge.
Removed useless stuff.