removing all AP specific functions