Little rebuild.
Removed some useless things.