Clean-up com.michalrus.helper's