take out broken analog code - will need to be properly refactored anyway