Removed unnecessary energy wrappers.