Clean version, removed startup(unused)