[CLEANUP] Remove/Replace non-standard phpdoc annotations