Issue #34 Removed all @api notations