Made a cleaner cleanall function, corrected the activator functions