Removing some useless code :-)