Dropping some useless code