removed HAO code, and cleaned up signatures and includes