Code cleanup

Removed notifications and commented-out code used during testing