more refactoring, removed twitter support