Removed UAP class. Not needed.