Removed some useless stuff...