Refractoring useless stuff...