Revert "Move aloha cleanup code to onClose method."

https://www.pivotaltracker.com/story/show/63207788

This reverts commit 85f04a05726989e4b4967da815c7bc67661fab1f.