clean wrapper, and use startup manager now