Cleanup code

take out pieces not used.  Just before adding alarm features.