Remove unneeded class statements because of New construction