Remove finals to match existing coding style