assistant - check ap before going out
assistant - remove unused code