Phase2 he 7

Changes to remove broken code