General cleanup from debugging; non-working code