Fix PHPdoc and remove unused in RFA