OpenAM cleanups