cleanup
Fix Horizon setup