Now useless code removed