Update of skelets

Refresh of the skelets
 * Removed redundant include and defines
 * Add PHPDocs comment