Really delete useless code this time