Star removal implemented and tweak energy logic