Removed some useless code