removed always_enabled attribute and cleaned up some calls