\api\apn refactored
\util removed