Activator comments and remove @AtStart