Further cleanups and add components to PoElli schematics