Revert "major refactoring and cleanup; more objects, pass alarm data"

This reverts commit 60a8d06e7bcb86044aaf2cb6e990fb9d1cbb605f.