Revert "Move aloha cleanup code to onClose method."